From 9bff1c12d480210d7acc86241c41d121964a88f4 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 10 Dec 2016 15:21:28 +0100 Subject: [PATCH] gsk: Remove custom GValue API for GskRenderNode --- docs/reference/gsk/gsk4-sections.txt | 4 - gsk/gskrendernode.c | 106 --------------------------- gsk/gskrendernode.h | 13 ---- 3 files changed, 123 deletions(-) diff --git a/docs/reference/gsk/gsk4-sections.txt b/docs/reference/gsk/gsk4-sections.txt index 4a226aa42b..7d590b4c50 100644 --- a/docs/reference/gsk/gsk4-sections.txt +++ b/docs/reference/gsk/gsk4-sections.txt @@ -53,10 +53,6 @@ gsk_render_node_set_blend_mode GskScalingFilter gsk_render_node_set_scaling_filters gsk_render_node_set_name -gsk_value_set_render_node -gsk_value_take_render_node -gsk_value_get_render_node -gsk_value_dup_render_node GSK_IS_RENDER_NODE GSK_RENDER_NODE diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c index 4f13ab6195..9a72da21b3 100644 --- a/gsk/gskrendernode.c +++ b/gsk/gskrendernode.c @@ -1472,109 +1472,3 @@ gsk_render_node_get_size (GskRenderNode *root) return res; } -/** - * gsk_value_set_render_node: - * @value: a #GValue - * @node: (nullable): a #GskRenderNode - * - * Sets the @node into the @value. - * - * This function acquires a reference on @node. - * - * Since: 3.90 - */ -void -gsk_value_set_render_node (GValue *value, - GskRenderNode *node) -{ - GskRenderNode *old_node; - - g_return_if_fail (GSK_VALUE_HOLDS_RENDER_NODE (value)); - - old_node = value->data[0].v_pointer; - - if (node != NULL) - { - g_return_if_fail (GSK_IS_RENDER_NODE (node)); - - value->data[0].v_pointer = gsk_render_node_ref (node); - } - else - value->data[0].v_pointer = NULL; - - if (old_node != NULL) - gsk_render_node_unref (old_node); -} - -/** - * gsk_value_take_render_node: - * @value: a #GValue - * @node: (transfer full) (nullable): a #GskRenderNode - * - * Sets the @node into the @value, without taking a reference to it. - * - * Since: 3.90 - */ -void -gsk_value_take_render_node (GValue *value, - GskRenderNode *node) -{ - GskRenderNode *old_node; - - g_return_if_fail (GSK_VALUE_HOLDS_RENDER_NODE (value)); - - old_node = value->data[0].v_pointer; - - if (node != NULL) - { - g_return_if_fail (GSK_IS_RENDER_NODE (node)); - - /* take over ownership */ - value->data[0].v_pointer = node; - } - else - value->data[0].v_pointer = NULL; - - if (old_node != NULL) - gsk_render_node_unref (old_node); -} - -/** - * gsk_value_get_render_node: - * @value: a #GValue - * - * Retrieves the #GskRenderNode stored inside the @value. - * - * Returns: (transfer none) (nullable): a #GskRenderNode - * - * Since: 3.90 - */ -GskRenderNode * -gsk_value_get_render_node (const GValue *value) -{ - g_return_val_if_fail (GSK_VALUE_HOLDS_RENDER_NODE (value), NULL); - - return value->data[0].v_pointer; -} - -/** - * gsk_value_dup_render_node: - * @value: a #GValue - * - * Retrieves the #GskRenderNode stored inside the @value, and - * acquires a reference to it. - * - * Returns: (transfer none) (nullable): a #GskRenderNode - * - * Since: 3.90 - */ -GskRenderNode * -gsk_value_dup_render_node (const GValue *value) -{ - g_return_val_if_fail (GSK_VALUE_HOLDS_RENDER_NODE (value), NULL); - - if (value->data[0].v_pointer != NULL) - return gsk_render_node_ref (value->data[0].v_pointer); - - return NULL; -} diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h index 8e1f44b256..5edb8b68b9 100644 --- a/gsk/gskrendernode.h +++ b/gsk/gskrendernode.h @@ -123,19 +123,6 @@ void gsk_render_node_set_name (GskRenderNode * GDK_AVAILABLE_IN_3_90 const char * gsk_render_node_get_name (GskRenderNode *node); -#define GSK_VALUE_HOLDS_RENDER_NODE(value) (G_VALUE_HOLDS (value, GSK_TYPE_RENDER_NODE)) - -GDK_AVAILABLE_IN_3_90 -void gsk_value_set_render_node (GValue *value, - GskRenderNode *node); -GDK_AVAILABLE_IN_3_90 -void gsk_value_take_render_node (GValue *value, - GskRenderNode *node); -GDK_AVAILABLE_IN_3_90 -GskRenderNode * gsk_value_get_render_node (const GValue *value); -GDK_AVAILABLE_IN_3_90 -GskRenderNode * gsk_value_dup_render_node (const GValue *value); - G_END_DECLS #endif /* __GSK_RENDER_NODE_H__ */ -- 2.30.2